Make getting the environment from gnome-session more robust

readlink() on /proc/<pid>/exe can have results like:

 /usr/bin/gnome-keyring-daemon.#prelink#.5DFZsF (deleted)
 /usr/bin/gnome-session (deleted)

To find gnome-session in a more robust way, read /proc/<pid>/cmdline
instead.

https://bugzilla.gnome.org/show_bug.cgi?id=616706

diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 27f7b0df018ebe7c52938516c89d7055a888464b..0cb6db71c073703484821d7aad5b2156227bfa9f 100644 (file)
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -37,10 +37,15 @@ def get_running_session_environs():
         if not stat.st_uid == myuid:
             continue
         try:
-            exe = os.readlink(piddir + '/exe')
-        except OSError, e:
+            f = open(piddir + "/cmdline")
+            command = f.read()
+            f.close()
+        except IOError, e:
             continue
-        if os.path.basename(exe) != 'gnome-session':
+        # /proc/cmdline is separated and terminated by NULs
+        command = command.split("\x00")[0]
+        command = os.path.basename(command)
+        if command != 'gnome-session':
             continue
         try:
             f = open(os.path.join(piddir, 'environ'))